Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3 ➡️ 6 #1025

Merged
merged 3 commits into from
Jul 31, 2024
Merged

3 ➡️ 6 #1025

merged 3 commits into from
Jul 31, 2024

Conversation

Crola1702
Copy link
Contributor

➡️ Forward port

Port ign-renderin3 to ign-rendering6

Branch comparison: ign-rendering6...ign-rendering3

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

@Crola1702 Crola1702 requested a review from iche033 as a code owner July 30, 2024 15:49
@Crola1702 Crola1702 requested review from azeey and Blast545 July 30, 2024 15:49
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Jul 30, 2024
nkoenig and others added 2 commits July 30, 2024 10:56
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Crola1702 <[email protected]>
* Remove camera.cc from integration tests

Signed-off-by: Crola1702 <[email protected]>

* Remove failing integration tests

Signed-off-by: Crola1702 <[email protected]>

* Disable ArrowVisual Test

Signed-off-by: Crola1702 <[email protected]>

* Disable Unit test that have segfaults on Mac

Signed-off-by: Crola1702 <[email protected]>

* Disable other tests

Signed-off-by: Crola1702 <[email protected]>

* Disable all tests that have segfaults in MacOs

Signed-off-by: Crola1702 <[email protected]>

---------

Signed-off-by: Crola1702 <[email protected]>
@Crola1702 Crola1702 force-pushed the Crola1702/3_to_6-2023-07-30 branch from d2dec85 to db7ad57 Compare July 30, 2024 15:57
@Crola1702 Crola1702 self-assigned this Jul 30, 2024
@iche033
Copy link
Contributor

iche033 commented Jul 30, 2024

there are some more homebrew test failures in this branch but that should probably be fixed separately

@Crola1702
Copy link
Contributor Author

@iche033 I can't merge this one. Can you help me here?

@iche033 iche033 merged commit c943da1 into ign-rendering6 Jul 31, 2024
8 of 10 checks passed
@iche033 iche033 deleted the Crola1702/3_to_6-2023-07-30 branch July 31, 2024 17:10
@iche033
Copy link
Contributor

iche033 commented Jul 31, 2024

yep done, merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants